commit 6be02cb83f78d11afb94c3886729ce4198fa61e0
author Eric Fiselier <eric@efcs.ca> Thu Apr 02 21:12:17 2015
committer Eric Fiselier <eric@efcs.ca> Thu Apr 02 21:12:17 2015
tree 6019b83d00962d2e1544703ba8a1c0ac6a36f832
parent 1d55ecf51364279841f140f0255af8f496a7ee3f

Fix race conditions in test class used throughout the std::thread tests. The test class 'G' reads and writes to the same static variables in its constructor, destructor and call operator. When threads are constructed using `std::thread t((G()))` there is a race condition between the destruction of the temporary and the execution of `G::operator()()`. The fix is to simply create the input before creating the thread. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@233946 91177308-0d34-0410-b5e6-96231b3b80d8 

test/std/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp index 476ca0c..4d3a742 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp @@ -45,7 +45,8 @@  int main()  {  { - std::thread t0((G())); + G g; + std::thread t0(g);  std::thread::id id0 = t0.get_id();  std::thread t1;  std::thread::id id1 = t1.get_id(); 

test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp index 94a30e7..2db9430 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp @@ -48,13 +48,16 @@  {  assert(G::n_alive == 0);  assert(!G::op_run); - std::thread t0(G(), 5, 5.5); + { + G g; + std::thread t0(g, 5, 5.5);  std::thread::id id = t0.get_id();  std::thread t1;  t1 = std::move(t0);  assert(t1.get_id() == id);  assert(t0.get_id() == std::thread::id());  t1.join(); + }  assert(G::n_alive == 0);  assert(G::op_run);  } 

test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp index 8cb2cb1..7198d22 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp @@ -13,6 +13,9 @@  // memory is not freed. This will cause ASAN to fail.  // XFAIL: asan   +// NOTE: TSAN will report this test as leaking a thread. +// XFAIL: tsan +  // <thread>    // class thread @@ -62,14 +65,13 @@    int main()  { -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES  std::set_terminate(f1);  { - std::thread t0(G(), 5, 5.5); + G g; + std::thread t0(g, 5, 5.5);  std::thread::id id = t0.get_id();  std::thread t1;  t0 = std::move(t1);  assert(false);  } -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES  } 

test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp index 36e0fbd..e88304e 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp @@ -55,16 +55,18 @@  {  #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES  { - assert(G::n_alive == 0); + G g; + assert(G::n_alive == 1);  assert(!G::op_run); - std::thread t0(G(), 5, 5.5); + std::thread t0(g, 5, 5.5);  std::thread::id id = t0.get_id();  std::thread t1 = std::move(t0);  assert(t1.get_id() == id);  assert(t0.get_id() == std::thread::id());  t1.join(); - assert(G::n_alive == 0); + assert(G::n_alive == 1);  assert(G::op_run);  } + assert(G::n_alive == 0);  #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES  } 

test/std/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp index 20c8da1..ddf96d0 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp @@ -9,6 +9,9 @@  //  // UNSUPPORTED: libcpp-has-no-threads   +// NOTE: TSAN will report this test as leaking a thread. +// XFAIL: tsan +  // <thread>    // class thread @@ -53,8 +56,11 @@  {  assert(G::n_alive == 0);  assert(!G::op_run); - std::thread t((G())); - std::this_thread::sleep_for(std::chrono::milliseconds(250)); + G g; + { + std::thread t(g); + std::this_thread::sleep_for(std::chrono::milliseconds(250)); + }  }  assert(false);  } 

test/std/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp index a5ea55a..5cca7b0 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp @@ -45,7 +45,8 @@  int main()  {  { - std::thread t0((G())); + G g; + std::thread t0(g);  std::thread::id id0 = t0.get_id();  std::thread t1;  std::thread::id id1 = t1.get_id(); 

test/std/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp index 2559303..0512e49 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp @@ -45,7 +45,8 @@  int main()  {  { - std::thread t0((G())); + G g; + std::thread t0(g);  assert(t0.joinable());  t0.join();  assert(!t0.joinable()); 

test/std/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp index 351c1cf..b97839c 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp @@ -45,7 +45,8 @@  int main()  {  { - std::thread t0((G())); + G g; + std::thread t0(g);  assert(t0.joinable());  t0.join();  assert(!t0.joinable()); 

test/std/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp index 37c2d9c..c8807a9 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp @@ -45,7 +45,8 @@  int main()  {  { - std::thread t0((G())); + G g; + std::thread t0(g);  pthread_t pid = t0.native_handle();  assert(pid != 0);  t0.join(); 

test/std/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp

diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp index e8dede1..49d4618 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp @@ -45,7 +45,8 @@  int main()  {  { - std::thread t0((G())); + G g; + std::thread t0(g);  std::thread::id id0 = t0.get_id();  std::thread t1;  std::thread::id id1 = t1.get_id();